resolve merge conflicts git vscode